Temporarily disable gjs tests

gjs is not currently installable on buildds due to the glibc transition
and a long dependency chain involving systemd-shim being preferred over
systemd-sysv, which ends with libnih1 Depends: libc6 (<< 2.26).

diff --git a/debian/changelog b/debian/changelog
index 8e953ea3bb704cfb2e8ef15416d819aeadb4ee9b..a7c6a3ca92e648e18f6b65ba5e9c127c7cb2414b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ ostree (2017.15-2) UNRELEASED; urgency=medium
   * d/p/2018.1/tests-Assert-that-byte-order-[etc.].patch:
     Add patch to fix test failures on big-endian machines
     (Closes: #886218)
+  * Temporarily disable gjs tests. gjs is not currently installable on
+    buildds due to the glibc transition and a long dependency chain
+    involving systemd-shim being preferred over systemd-sysv, which
+    ends with libnih1 Depends: libc6 (<< 2.26).
 
  -- Simon McVittie <smcv@debian.org>  Thu, 04 Jan 2018 12:58:50 +0000
 

diff --git a/debian/control b/debian/control
index f270a767e84d917ebe08906d77b6b0e9b584ded1..3c3f9f33562f762a7b8e3745876d7c3ec6c437bc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends:
  e2fslibs-dev,
  elfutils,
  fuse,
- gjs [!sparc64],
  gobject-introspection,
  gtk-doc-tools <!nodoc>,
  libarchive-dev,

diff --git a/debian/rules b/debian/rules
index 7aef179b64cf7ef6383ef5b5c680e0fac0c114b0..20965e12035a3a17b5bf4a495a1c3c15343bd0a5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ override_dh_autoreconf:
        env NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 configure_options = \
+       GJS=some-nonexistent-gjs-binary \
        --enable-installed-tests \
        --libexecdir='$${prefix}/lib' \
        --with-dracut \